Revision: baz--resolve--1.2--patch-2
Archive: jblack@gnuarch.org--2004
Creator: James Blackwell <jblack@canonical.com>
Date: Wed Jan 26 00:54:18 EST 2005
Standard-date: 2005-01-26 05:54:18 GMT
New-files: tests/.arch-ids/test-conflicts.sh.id
    tests/test-conflicts.sh
Modified-files: libarch/apply-changeset.c
    libarch/proj-tree-lint.c libarch/proj-tree-lint.h
    tests/Makefile.in tests/test-merge.sh
New-patches: jblack@gnuarch.org--2004/baz--resolve--1.2--patch-2
Summary: Baz conflict code now records what conflicted
Keywords: 

